Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 30 Aug 2010 22:42:25 +0000 (22:42 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 30 Aug 2010 22:42:25 +0000 (22:42 +0000)
commitc8b5e7c6848b9f98c04fccc4829572b571b94ed5
treebdc573f0bdc229db733192afd3fdfb7f1f0b3f8e
parent46355f6961c8591637ee854b93adf2496b9a0d60
parent25a78de2b4464538f1bc7c6e9e7ff0a0a6a87b72
Merge from mainline.